Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 14:05:08 +0000 (14:05 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 14:05:08 +0000 (14:05 +0000)

Trivial merge